meta
Merge branch 'master' of https://github.com/fitzlucassen/hackathon21112014
fix bug js