making projects show prettier
adding lock file back
Merge branch 'master' of github.com:ChooChooo/I-want-an-iPad

Conflicts:
	Gemfile.lock
	app/controllers/projects_controller.rb
Merge branch 'master' of github.com:ChooChooo/I-want-an-iPad

Conflicts:
	Gemfile.lock
	app/controllers/projects_controller.rb