Datar from derping at night
Merge branch 'master' of https://github.com/201340ak/csrepo

Conflicts:
	DatarConverter/src/unl/cse/DatarConvert.java
Phase 1 complete!
Merge https://github.com/DeltaClubDev/csrepo

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.history/9f/50d7d50a759300131c43dd4e154d4537
	.metadata/.plugins/org.eclipse.core.resources/.history/c0/a05f854fa39300131c43dd4e154d4537