Remove and add smoe stuff
Merge branch 'master' of github.com:octoblu/att-hackathon