Removed access.log file
Added access.log to .gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	access.log