Ignoring log and .htpasswd
Merge branch 'develop' of github.com:tbeigle/cbmusic into develop