Moved screenshot
Merge branch 'master' of https://github.com/TrangPham/Ottawa311

Conflicts:
	screenshot.png