Fixes before David does the merge
Merge branch 'development' of github.com:vidbina/startup-tycoon into development

Conflicts:
	app/views/home/index.html.erb
	app/views/layouts/_header.html.erb
preparing to merge