linking to stories from profile page added
karma gifting improved
Merge branch 'master' of github.com:devDesign/KarmaCloud

Conflicts:
	app/layout.erb
	app/views/user/show.erb
	public/stylesheets/style.css.map
merger
Merge branch 'master' of https://github.com/devDesign/KarmaCloud into layout_branch

Conflicts:
	public/stylesheets/style.css.map
login and new user messages showing up
fixed password
Merge branch 'master' of https://github.com/devDesign/KarmaCloud
Merge branch 'maps-api'

Conflicts:
	app/layout.erb
layout
works
fix
Merge branch 'master' of github.com:devDesign/KarmaCloud
removed uneeded files
story locations
Merge branch 'master' into maps-api
Switching to local db