home page almost done
navbar navigation modified
start of contact
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/users/index.html.erb
Merge pull request #22 from tdoshi/master

Home Page