Added grunt and minification
Merged