added .gitignore
modified gitignore
manually modified activity_map.xml to match upstream
untracked bin and gen
added battle mechanics