removed log files
removed logs from git
adding an htaccess file
adding access to ntt files
small bug fix
Merge branch 'dev'
small bug fix
small bug fix
small bug fix
Merge branch 'master' of github.com:thespacedoctor/pessto_marshall_webapp
small bug fix
Merge branch 'master' of github.com:thespacedoctor/pessto_marshall_webapp
small bug fix
correcting .htpasswd path
small bug fix
small bug fix
updated apache conf file to alias the exports folder
Merge branch 'master' of github.com:thespacedoctor/pessto_marshall_webapp
bug fix
Merge branch 'refs/heads/master' into bug

Conflicts:
	.gitignore