4/12/2014 2:30pm
4/13/2014 11:30am
Merge https://github.com/charleswinin/SuperMegaFunTime

Conflicts:
	SuperMegaFunTime/README.md
	SuperMegaFunTime/src/main/scala/CaseClassMapping.scala
	SuperMegaFunTime/src/main/scala/Tables.scala
	SuperMegaFunTime/src/test/scala/TablesSuite.scala
4/13/2014 11:30am
4/13/2014 11:30am
3:15pm 4/25/2014
Merge https://github.com/lauralondo/SuperMegaFunTime

Conflicts:
	SuperMegaFunTime/README.md
	SuperMegaFunTime/src/test/scala/TablesSuite.scala
	src/main/scala/CaseClassMapping.scala