push test 3
Merge branch 'master' of https://github.com/kartikpalani/maslab-staff-2013

Conflicts:
	KameronTest.txt