set up working server
Merge branches 'dev' and 'master'
add build dir to .gitignore
wild and crazy changes