Some other changes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/skills_controller.rb
changes to make resume work further
Changes to resume
Merge pull request #6 from zipzaprjr/master

Resume
merge with ron-working