Working Battle

Here is an example of a working battle.
Bespoke Animal Class Attacks
Merge branch 'master' of https://github.com/nickgeorgiou/native-pokemon

Conflicts:
	app/index.html
	app/views/main.html
Merge with Logic branch
Merge branch 'UI_branch'

Conflicts:
tick	app/index.html
tick	app/views/main.html
Merge branch 'master' into UI_branch