Added new java files for selection options
Merge branch 'master' of github.com:maviskay/291Project1

Conflicts:
	database.java