Testing included

Testing is included now
Merge branch 'master' of https://github.com/sadpants/P3-Rapport