small refactoring of Troll Guard logic
merged development
fixing SpecRunner
fixed merge conflicts in ImmortalListItemView
ready to merge development
merged development
merged development again
added url redirect if id is incorrect
Merge branch 'development' of https://github.com/genevievebelle/Scrawler-UI into post-code-review-test-coverage
smashed session spec again with changes to warning message
Merge pull request #27 from genevievebelle/jasmine-testing

Jasmine testing
fixed some tests
merged from dev