Merging text

Editing out the merge-message
Added Grunt files for automation
Removed manifest from ignore
Made changes to .gitignore
Merge pull request #1 from sgnl02/grunt

Grunt