Merge pull request #12 from Johnidel/master

pulling again
safe

pretty much done except i'm not sure how to get the loading bar to work
concurrently with other draw animations
Merge pull request #13 from Johnidel/master

pulling stuff
Merge pull request #19 from cpoudel3/master

safe