Improved an if-statement
Merge remote-tracking branch 'origin/master'
new error check in DC
Moved error checking from datacontroller to Database, which is more logical
Last commit of the day. DAT255 officially done. Summer. Break. Life. Adventure. Fun. #Awesomeness
updates design