Start of Nav bar
Added nav bar
made a few changes
Finished nav bar and layout of home page
fixed styling issues using foundation_and_overrides.scss
all tests of mine are passing
Merge branch 'master' of https://github.com/LaunchAcademy/char_brawls into AddNavBar

Conflicts:
	app/views/layouts/application.html.erb
Add rails_12factor gem
Specify Ruby version
Merge pull request #8 from LaunchAcademy/AddNavBar

RFR
Resolve merge conflicts
Merge pull request #10 from LaunchAcademy/AddPhotostoDB

RFR - Add photos to Database
Resolve merge conflicts