Merge branch 'master' of https://github.com/bohnje/SoftDev2
Merge branch 'master' of https://github.com/KyleBrownCS/SoftDev2
more flask tests
Merge branch 'master' of https://github.com/KyleBrownCS/SoftDev2
Merge pull request #80 from bohnje/master

flask tests