server configuration.php and Guardfile
Merge branch 'master' of https://github.com/alexrah/teddynet3