log - need to add to gitignore
Merge branch 'master' of https://github.com/earthlinkdesign/iworldonline

Conflicts:
	var/log/system.log