added a* not working yet
Merge branch 'test' of github.com:ninjamode/ris into test

Conflicts:
	src/app/App.java