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
Added more fields to Parts
Can delete elements and added parts and sections controller (default copy)
Merge pull request #6 from keanulee/more-fields-on-part

Added more fields to Parts
Merge branch 'develop' into feature-delete-elements

Conflicts:
	app/assets/javascripts/main.js
	app/views/resumes/index.html.erb
Merge pull request #7 from keanulee/feature-delete-elements

Can delete elements and added parts and sections controller (default cop...
Fixed bug
Merge pull request #8 from keanulee/date-helper-fix

Fixed bug
Update README.rdoc
Merge pull request #9 from julienlapointe/patch-1

Update README.rdoc
Use environment variables for LinkedIn API keys
Merge pull request #10 from keanulee/production-api-keys-fix

Use environment variables for LinkedIn API keys
Merge branch 'develop'
Emergency fix

See
https://devcenter.heroku.com/articles/rails-asset-pipeline#troubleshooti
ng