adds basic features
Merge branch 'master' of github.com:chococookies/Pikachu