temporary changes
Temporary words loading work
Working pre-emptive testing page
Merge branch 'master' of github.com:csc3942014/group4