sort stories
remove scaffolded specs
respecs for priority
remove git conflicts
Merge branch 'master' of github.com:salmonrun/starter_app

Conflicts:
	app/views/projects/show.html.haml
remove scaffolded tests
refactor sorting tests to align with styling changes
really remove scaffolded tests