created view
merged app.js
???
Merge branch 'master' of https://github.com/chushao/hackday2014
freaking search
Merge branch 'master' of https://github.com/chushao/hackday2014