m
Merge branch 'master' of github.com:petercliu/resume

Conflicts:
	resume_application/public/css/main.css
	resume_application/public/index.html