Ignores /gen and /bin
Merge branch 'UberMaster' of
https://github.com/Cletus-Doy-Shinda/SDAP1.git into UberMaster

Conflicts:
	SDAP1/gen/com/selfDesign/sdap1/R.java