Merge branch 'master' of https://github.com/W4201Project2014/W4201-Project

This reverts commit 4fa919ffe08a8438f28966bb769822a66f612944.

Conflicts:
W4201project/Test.R
Merge branch 'master'

Conflicts:
	W4201project/Test.R