Database added
Merge branch 'proj_4_sept_2014' of https://github.com/invisiblekid15/java-minor-14