Moved toast
Added ctonroller stuff
Fixed a retake bug
Merge pull request #49 from SamLau95/RandomBugFixesWOOHOO

Retake bugs