configure for heroku
delete and readd gemfile.lock for heroku
move sqlite3 to development/test group
Merge pull request #31 from dabeeya/master

few tests
add comments for presentation
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks

Conflicts:
	log/development.log
Merge pull request #32 from dylanerichards/master

presentation
pull from upstream
added extra tests to controller
fixed merge conflicts
Remove unused instance variable in user controller.
Add additional tests in answers controller.
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks
Update README.md
Merge branch 'master' of https://github.com/user1011/stacksonstacks
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