general commit
Merge branch 'master' of https://github.com/phrayezzen/hacktx2013