branch testing
committed changes on this branch. got rid of .gitignore file
Merge branch 'master' of https://github.com/jsroen/CS-Fair-Dev