Travis CI setup
remove tabs
Merge branch 'master' of https://github.com/dcritchlow/CS3230