Does a lot of changes
Does a lot of changes
Updates ignore file.
Merge branch 'master' of github.com:wkoder/algorithms

Conflicts:
	FacebookHackerCup/1.in
	FacebookHackerCup/1_1294453983043.out
	FacebookHackerCup/3.in
	FacebookHackerCup/3_1294458418574.out
	FacebookHackerCup/4.in
	FacebookHackerCup/4_1294848842272.out
	FacebookHackerCup/4_1294849607896.out
	FacebookHackerCup/5.in
	FacebookHackerCup/5_1295071041645.out
	FacebookHackerCup/bin/year2011/qualification/1.in
	FacebookHackerCup/bin/year2011/qualification/1_1294453983043.out
	FacebookHackerCup/bin/year2011/qualification/3.in
	FacebookHackerCup/bin/year2011/qualification/3_1294458418574.out
	FacebookHackerCup/bin/year2011/qualification/4.in
	FacebookHackerCup/bin/year2011/qualification/4_1294848842272.out
	FacebookHackerCup/bin/year2011/qualification/4_1294849607896.out
	FacebookHackerCup/bin/year2011/qualification/5.in
	FacebookHackerCup/bin/year2011/qualification/5_1295071041645.out
	FacebookHackerCup/src/Template.java
	FacebookHackerCup/src/old/1.in
	FacebookHackerCup/src/old/1_1294453983043.out
	FacebookHackerCup/src/old/3.in
	FacebookHackerCup/src/old/3_1294458418574.out
	FacebookHackerCup/src/old/4.in
	FacebookHackerCup/src/old/4_1294848842272.out
	FacebookHackerCup/src/old/4_1294849607896.out
	FacebookHackerCup/src/old/5.in
	FacebookHackerCup/src/old/5_1295071041645.out
	FacebookHackerCup/src/old/DoubleSquares.java
	FacebookHackerCup/src/old/PegGame.java
	FacebookHackerCup/src/old/StudiousStudent.java
Fix merge problems.
Solve more problems.
Merge branch 'master' of git@github.com:wkoder/algorithms.git
More solutions, yay!