Merge pull request #9 from jasonamyers/master

Stickers Apps and More
Grids

Signed-off-by: Jason Myers <jason@jasonamyers.com>
Merge remote-tracking branch 'upstream/master'
Changing to Emma

Signed-off-by: Jason Myers <jason@jasonamyers.com>
Merge branch 'master' of heroku.com:pytn
Fixing Bugs

Signed-off-by: Jason Myers <jason@jasonamyers.com>