Update a tiny bit
snapshot
Update for big screen
Merge branch 'master' of heroku.com:ddportfolio into heroku
Update for the big screen
Snapshotting progress
snapshot
test commit for heroku
Merge branch 'master' of heroku.com:ddportfolio

Conflicts:
	dist/scripts.js
	models/resumeModel.js
temp commit
Merge branch 'heroku'

Conflicts:
	dist/scripts.js
	models/resumeModel.js
Reverting the gruntfile
Fix the script path
Fix the script path
Snapshot of styling changes
Less padding under employer names
Remove serial comma in Spanish degree title
Move most assets into app/
Heroku test
Snapshot for Heroku