Removed log file from tracking
Merge branch 'master' of git://github.com/rlfriedm/HAP-APP

Conflicts:
	log/development.log