Renamed proper files, updated gruntfile to avoid line comments that break keyframe
Merge branch 'deploying'
Merge pull request #2 from jjperezaguinaga/master

Updating deployment environment, finished grunt build