init
both
test both
Merge commit 'ccb71879fa763a55df43d6aa01671b7a3be2c27c'

Conflicts:
	Gruntfile.js