submit
Merge branch 'master' of https://github.com/yale-stc-developer-curriculum/Yalies-On-Rails-2014-Spring
make new dummy file to test pull
copied example files
did a bunch of stuff
added playlist descritpion
delete + template
update
getting classexamples, pokemon folder
Merge branch 'master' of https://github.com/yale-stc-developer-curriculum/Yalies-On-Rails-2014-Spring
pokemon
Merge pull request #14 from squidgetx/master