Added text adding gui and bugfixes
Edit text stuff completed yaaaaay
Merge branch 'master' of https://github.com/mste690/Assignment3
icons fixed
commit to allow merge
merge conflist fixed'