getting rid of apache-config that got put in by accident
ignoring apache-config
Merge pull request #28 from jwj61/develop

Develop
Merge branch 'develop' of github.com:openwebwork/webwork2 into develop

Conflicts:
	conf/webwork.apache-config