Don't fuck this up :)
Cleaned up some code a little bit.
Merge branch 'master' of git://github.com/vianuevm/hackathon
Deleted welcome