fuck mac fuck mac fuck mac
Merge branch 'RolanARES_Branch_of_awesome' of https://github.com/whoshuu/chimerider into RolanARES_Branch_of_awesome

Conflicts:
	src/com/example/chimerider/information/CUser.java
	src/com/example/chimerider/information/EditField.java
Merge branch 'RolanARES_Branch_of_awesome' of https://github.com/whoshuu/chimerider into RolanARES_Branch_of_awesome