Merge pull request #52 from badnack/development

forgot to push default pictures
removed puts
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
fb workaround
Merge branch 'development'
fixed bug in user pages and changed css
fixed bug in user pages
forgot check
removed comments
Merge branch 'development'

Conflicts:
	app/views/home/about.html.erb
	app/views/users/show.html.erb
minor fixes
Merge branch 'development'

Conflicts:
	Gemfile
Merge pull request #56 from badnack/master

merging development