bower init
grunt init
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDBGlosser

Conflicts:
	.gitignore
	LICENSE
	README.md