testing merges
Merge branch 'master' of https://github.com/kacxdak/resume-online
Conflicts:
	siteAPI/application/config/config.php