Moved database to db instead of db2, reset the database
Merge branch 'master' of https://github.com/Avans/Super-Sexy-Wordfeud.git