Added all model classes.
Started adding DAOs.
Resolved merge, taking my changes to Account.java.
Updated .gitignore
Revert changes to .gitignore, not really necessary.
Resolved merge by deleting class files.