Working base Testing page
Merge branch 'master' of github.com:csc3942014/group4