Merge pull request #50 from ThomasRahn/Alan

UI Goodies
Merge branch 'Development' of github.com:ThomasRahn/soen390 into Alan