Database should now have tables
Database tables should now be done
Merge branch 'development' of https://github.com/SETeam42014/test.git into development