able to add
Merge branch 'master' of https://github.com/sohyeonlee/hackjam2014
merge