merged changes from Trey
Merge branch 'master' of https://github.com/digitzfone/hacktive