Merge branch 'Development' into 'master'

.gitlab-ci.yml

.idea/Group10HabitTracker.iml

.idea/misc.xml

.slugignore

Gemfile

Gemfile.lock

app/assets/config/manifest.json

app/assets/images/TempLogo.png

app/assets/javascripts/application.js

app/assets/javascripts/goals.coffee

app/assets/javascripts/manifest.json.erb

app/assets/javascripts/serviceworker-companion.js

app/assets/javascripts/serviceworker.js.erb

app/assets/stylesheets/application.scss

app/assets/stylesheets/buttons.scss

app/assets/stylesheets/goals.scss

app/assets/stylesheets/legal.scss

app/assets/stylesheets/navbar.scss

app/controllers/api/v1/habits_controller.rb

app/controllers/dashboard_controller.rb