tons of shit
Merge branch 'master' of https://github.com/tazemebro/wordpress-enviroment

Conflicts:
	themes/askbryan/index.php