completed assignment demo
Merge branch 'master' of https://github.com/yale-stc-developer-curriculum/Yalies-On-Rails-2014-Spring
added a dummyfile
unadded file
added dummyfile
add classassignment
fixes
update assignment
Merge pull request #1 from peternguyen117/master

Your Pokemon does what specification requires of it. It could do some of those things in a slightly more robust way.
Your Sinatra app could use some more work, as some parts of it are clearly pre-implementation. But you've figured out how to work with `session` and `params`, which is important. We'd love to see a pull request with fixes, but it's not mandatory.

Merging.
Merge pull request #5 from danielpearson7411/master

Assignment "Demo" - Daniel Pearson
semiworking app