added more stuff
Merge branch 'master' of https://github.com/macmania/UITeamA

ý5:wq:q!