profile view complete!
Merge branch 'master' of https://github.com/kacxdak/resume-online

Conflicts:
	siteAPI/application/controllers/profile.php