10/7/2014
test commit
Merge branch 'master' of https://github.com/yangchuxuan/phys6130

Conflicts:
	pi.c