Changing travis so that it runs some tests for us
Merge branch 'master' of github.com:fpereira1/simpleshop