init
test
Merge branch 'master' of https://github.com/masterjay/Dragon-Uncharted

Conflicts:
	src/Main.as
test