almost done with GUI

pedro
Merge branch 'master' of https://github.com/PUCCS/131S14SELab

Conflicts:
	NEW_Merged_Conversions.rb