fastimage
Merge branch 'master' of github.com:JumpStartGeorgia/Crowd-Source-Protocols

Conflicts:
	app/views/root/protocol.html.erb