Main commit for today
Merge branch 'development' of https://github.com/M-Porter/IST412Project into development