Merge pull request #154 from Adron/test

Test merge.
Merge pull request #155 from Adron/test

test push
Merge pull request #157 from Adron/test

Tests should work now.
Merge pull request #159 from Adron/test

Temp comment to push server test code.
Merge pull request #160 from Adron/test

Minor formatting of code and put the test back for post deploy.
Merge pull request #162 from Adron/test

Test
Circular committing?
Merge branch 'test' of github.com:Deconstructed/Storgie into test
one day.
done I hope with this push.
Merge branch 'test'