.gitignore
Merge branch 'develop' of github.com:cmap/barista into develop
added jquery deparam