fix merge conflic in app
remove span
fix button
fix gemfile merge
stubbing out tests
fuck the gemfile
procfile
asdad
Merge pull request #3 from tiger-swallowtails-2013/rspec2

Rspec2