Stuff
Merge branch 'master' of https://github.com/kuroitenshi/Gecko

Conflicts:
	src/model/Frame.java