added a bunch
Merge branch 'master' of https://github.com/joker23/ACM

Conflicts:
	topCoder/Main.java