moved code around for readability
Merge branch 'develop' into feature-list-stuff

Conflicts:
	app/views/resumes/index.html.erb
added json functionality
Merge branch 'develop' into feature-list-stuff

Conflicts:
	app/views/resumes/show.html.erb
PR Comments
Merge pull request #5 from keanulee/feature-list-stuff

Feature list stuff