Head and gitignore update
Merge branch 'master' of https://github.com/flinx777/omega

Conflicts:
	includes/head.php