Testing
Fixes
changes
Merge branch 'master' of github.com:perljammed/bananas

Conflicts:
	app/views/layouts/application.html.erb
Merge branch 'master' of github.com:perljammed/bananas
Working on updates