-changed some stuff. forgot what i did
Merge branch 'master' of https://github.com/tinazheng/teluxe
-finalized something