I added fun.
Merge branch 'master' of https://github.com/sazad/tartanhacks