error msg and other stuff work now
Merge branch 'master' of https://github.com/nicholascgilpin/AggieSnap_28

Conflicts:
	display.cpp