Fixes # 5, fixes #24, added Pokemon icon to form, fixed other bugs
Merge pull request #28 from codemonkey85/dev

Fixes # 5, fixes #24, added Pokemon icon to form, fixed other bugs