homepage navbar
first shoot Home page
conflit gemfil
Added Facebook Connect
resolve conflict
Resolved conflicts
Merge pull request #4 from deuxio/homepage_design

Homepage design
Merge branch 'add-facebook-connect'
Merge branch 'master' of github.com:deuxio/airbnc

Conflicts:
	Gemfile.lock
merge master with this branch