configure for heroku
delete and readd gemfile.lock for heroku
move sqlite3 to development/test group
began a few tests for controllers
cannot pull till i commit these files
Merge pull request #30 from user1011/master

Add edit/delete to answers
merge conflicts
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks

spec tests
spec tests
made most test work
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
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
Merge branch 'master' of https://github.com/user1011/stacksonstacks