Project show page and User show page
Merge branch 'master' into judy/views

Conflicts:
	app/assets/stylesheets/global.css.scss
	app/assets/stylesheets/projects.css.scss
	app/controllers/users_controller.rb
	app/views/users/show.html.erb
Ignore DS_Store files
Merge pull request #12 from jjow/judy/views

Judy/views