Finished Waiting page
Merge branch 'master' of https://github.com/davidwoody/teachme.git