update branch from master
added some linking interfaces to the database
Merge branch 'master' into gerzain
Merge branch 'master' of https://github.com/zasmail/HackRice
Merge branch 'master' of https://github.com/zasmail/HackRice
Merge branch 'gerzain'
added 2 classes