Merge remote-tracking branch 'origin/dillon' into manfred
team page stuff
Merge remote-tracking branch 'origin/dillon' into manfred
sell process
dillon db stuff
clean the things
Merge remote-tracking branch 'origin/manfred' into dillon
dillin cleanup
readding htaccess and wp-config