Merge pull request #8 from mtabor150/master

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

Conflicts:
	src/campuscreatures/main/MainActivity.java
major modifications to battle mechs
Merge pull request #9 from mtabor150/master

update
Merge pull request #43 from pmarti28/master

battle mechanics modified