preaparing for pull
Merge branch 'master' of https://github.com/timsants/CS147-Project
preparing for pull
Merge branch 'master' of https://github.com/timsants/CS147-Project

merging with travis code