nada
copy pasted mainactivity
Merge branch 'master' of https://github.com/pmarti28/CampusCreatures

Conflicts:
	src/campuscreatures/main/MainActivity.java
major modifications to battle mechs