added test
Merge master branch to home Ubuntu computer 2014-08-20

Merge branch 'master' of https://github.com/vitale232/Thesis-Code