Just erasing some blank spaces
Merge branch 'develop' of github.com:Xanadhi/time_capsule into develop

Conflicts:
	app/views/index.erb
Minor changes to name columns in user, added more routes, started user view page