nothing
added ignore
Merge branch 'master' of https://github.com/dring1/Lousylandlord

Conflicts:
	log/development.log
	tmp/pids/server.pid