added some agile stuff
Merge branch 'master' of github.com:rtirserio/resume

Conflicts:
	resume.json