commit before pull
Merge branch 'master' of github.com:jrl08d/kunstant_2
Merge branch 'master' of github.com:jrl08d/kunstant_2
Merge branch 'master' of github.com:jrl08d/kunstant_2
Merge branch 'my-feature'

Conflicts:
	app/assets/stylesheets/application.css
	app/assets/stylesheets/goals.css
	app/assets/stylesheets/scaffold.css
	app/views/goals/index.html.erb
	app/views/layouts/project.html.erb
	app/views/projects/index.html.erb