Merge pull request #51 from badnack/master

forgot to push default pictures
Merge pull request #52 from badnack/development

forgot to push default pictures
Changed lady serving cake image to local asset.
Added lady serving cake pic...for real...
Moved facebook #s to environment
removed puts
Removed FB from devise.rb. Not sure why it doesn't load from env. Not set up on FB side?
Merge pull request #53 from badnack/master

Facebook fix
Merge pull request #54 from badnack/development

Development
added maps
a little of css
Merge remote-tracking branch 'upstream/development' into development
merged development
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile