git pull
git commit -a
Commit again
Merge branch 'master' of https://github.com/grantbacs/POOFS

Conflicts:
	src/Database/DB.java

git pull