grunt
Merge branch 'master' of git+ssh://github.com/makeros/jquery-modalMsg

Conflicts:
	.gitignore
new bower