Put everything up to date with the latest demo

 with '#' will be ignored, and an empty message aborts the commit.
Merge branch 'master' of https://github.com/Timmons02/SAITeam