Wordpress 4.0
Wordpress Only
ignore wp-config
ignore wp-config
Initial commit
Merge branch 'master' of https://github.com/reign7/om

Conflicts:
	.gitignore
delete
upload
wordpress 4