development log
Merge branch 'master' of github.com:stephs829/hongkonghacknights

Conflicts:
	log/development.log
minor changes. no logo added yet