Merge pull request #1 from jackyujieyang/master

haha.txt added
working on frame reset
Merge pull request #2 from jackyujieyang/master

fixed prof's errors