Commit 26/10/2014

Database working as intended