sharing is caring
Merge branch 'master' of github.com:soad003/flatman

Conflicts:
	app/views/dashboard/share.html.erb
sharing
Merge branch 'master' of github.com:soad003/flatman