layout branch
layout
file cleanup
Merge branch 'master' of github.com:devDesign/KarmaCloud
added user_name to stories
Merge branch 'master' of https://github.com/devDesign/KarmaCloud into layout_branch
story page done with comments working
Merge branch 'master' of https://github.com/devDesign/KarmaCloud

Conflicts:
	app/actions.rb
Merge branch 'maps-api'
merge
layout
better cluster markers
Javascript getLocation Finally works for Logingit add *