battle methods, controller folder, preparing for restructuring
Merge branch 'master' of https://github.com/shrig94/pokemon

Conflicts:
	server/pokemons.js