added model elements
Merge branch 'master' of https://github.com/csacsi/poke

Conflicts:
	poke.xcodeproj/project.pbxproj