Changes from PC
Merge branch 'master' of https://github.com/jmphil09/scala-99problems

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/99 Scala Problems/.indexes/e4/56/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/99 Scala Problems/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/32.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.jdt.core/3164769823.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
	99 Scala Problems/.cache