updated local project with git version of project
Merge branch 'master' of
https://github.com/kylejamesross/CMPUT301W13T09.git

Conflicts:
	CMPUT301Project/gen/com/cmput301w13t09/cmput301project/R.java
added some more test cases working on testing the email stuff
Merge branch 'master' of https://github.com/kylejamesross/CMPUT301W13T09.git