Initial commit
Initial commit
Merge branch 'master' of github.com:bbusche/WP-Theme-Workshop
Initial commit
Merge branch 'master' of github.com:bbusche/WP-Theme-Workshop

Conflicts:
	README.md
Updated gitignore to include phpMyAdmin
Trying to ignore phpMyAdmin
Merge branch 'master' of github.com:bbusche/WP-Theme-Workshop