Adding new changes
commiting something
Merge branch 'master' of https://github.com/kiyoto/thorn-hackathon

merging