JUN1810572013
Merge branch 'master' of github.com:jki14/ICPC.Workstation

Conflicts:
	tc.f/PolygonTraversal.cpp