add AFT level 1,2
Merge branch 'Giga-macbook-air' of
https://github.com/gigayaya/PuffinCherry.git into Giga-macbook-air

Conflicts:
	src/cloudmosa/Puffin.java