temp deleting file
temp delete
Merge branch 'master' of https://github.com/baxterross/wegottago

Conflicts:
	app/views/user_notification/friend_request.html.erb
Merge branch 'master' of https://github.com/baxterross/wegottago
added styles for unauth splash page. Using static image for background. Need some clarification on how large carousel image is supposed to be.
Additions to unauth navbar
Merge pull request #1 from h-hart/master

First changes to home page!