random character chosen
Merge branch 'master' into random_char

Conflicts:
	public/js/marvel_api.js
Merge pull request #14 from nifengle/random_char

random character chosen