Ignore file list update

bin/
gen/
.classpath
.project
test/.project
local.properties
build.xml

are unnessary
Ignore file list update

bin/
gen/
.classpath
.project
test/.project
local.properties
build.xml
are unnessary
Merge branch 'Alex' of https://github.com/alextang96/Fung-Yuen-Buttery
Merge branch 'master' of github.com:alextang96/Fung-Yuen-Buttery

Conflicts:
	.gitignore