removed
gitignore
Merge branch 'origin/master'

Conflicts:
	src/test/TestAccount.java