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

Conflicts:
	.gitignore