test
Merge branch 'master' of https://github.com/darenkeck/room_eq

Conflicts:
	template_project/src/com/example/template_project/Template.java