Added basic DAO implementations (Still needs the functionality)
Only ignore user specific intellij files
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml