added protocol column
Merge branch 'master' of https://github.com/brandon-dacrib/cloverleaf

Conflicts:
	app/db/sample.db
trying for color codes