edited gruntfile - concat & uglify work
Merge branch 'master' of https://github.com/willchen90/shortly-deploy

Conflicts:
	package.json
editing gruntfile
using build
remove timegrunt
not using grunt
deleted gruntfile