CSS merge
Class UI and Logic
merge conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	generationflux.suo
	generationflux/bin/generationflux.dll
	generationflux/bin/generationflux.pdb
	generationflux/obj/Debug/generationflux.dll
	generationflux/obj/Debug/generationflux.pdb