Added minimal apache2 configuration for jsowl-cgi
Updated .gitignore
something
Fixed merge conflict