modified:   server.geany
Merge branch 'master' of https://github.com/damiencross/CheckIn

Conflicts:
	server.geany

	modified:   .gitignore
	deleted:    agent.geany
	modified:   agent/checkinagent.py
	modified:   agent/connector.py
	modified:   agent/ipparser.py
	modified:   agent/timeparser.py
	deleted:    server.geany
	modified:   server/checkinserver.py
	modified:   server/connhandler.py
	modified:   server/logger.py
	modified:   server/mailer.py
	modified:   server/sequelparse.py
	modified:   agent/ipparser.py
	modified:   agent/timeparser.py
	modified:   server/checkinserver.py
	modified:   server/connhandler.py
	modified:   server/sequelparse.py