WHERE THE FUCK DID YOU GUYS PUT MY MERMAID??

Uh.. so committing so I can pull... and assets functionality added,
btdubs.
Merge branch 'master' of github.com:rhanak/merwar

Conflicts:
	charmanager.py