Initial commit
Added gitignore
Updated .gitignore, added Omega 4, added Omega 4 subtheme
Updated .gitignore
resolve conflict on merge