added extra tests to controller
fixed merge conflicts
Merge pull request #33 from user1011/master

Update readme, and controllers test
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks
added edit link to question
Merge pull request #34 from dabeeya/master

tests and edit button
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks