add feature testing for questions and categories. all passing, but not complete
pull from master, most up to date, plus questions and answers tests
merge conflict with coverage stats
Admin authentication
Admin authentication
add more tests to question features. functional testing is implemented
Merge branch 'master' into testing

Conflicts:
	coverage/.resultset.json
add associations to factories. testing of relationships is much more accurate
Vote and admin tests
style answer show page and add links to redirect back to appropriate location (from header)
Voting tests, Admin tests
try page reload
Merge pull request #83 from shaunmcgeever/testing

Testing
fix homepage back button bug
nevermind that bug fix does not work
delete unnecessary js and header color white
Merge branch 'categories-index' into answer_show
Merge branch 'master' of https://github.com/fiddler-crabs-2014/thedelta
fix merge conflict with coverage folder
Added vote tests