#yoloswag tests
Merge branch 'master' of github.com:cs373-spring-2014/idb-tests