asdas
Merge heroku.com:khoaresumes

Conflicts:
	app/views/pages/qualifications.html.erb