no idea what I did....
Merge branch 'master' of https://github.com/cookacounty/IPtracker.git
Merge branch 'master' of https://github.com/cookacounty/IPtracker.git

Conflicts:
	IPtracker.html