making it pretty.... kind of
Merge branch 'master' of github.com:XrXr/KodingHackathon2014