hi
Merge branch 'HEAD' of https://github.com/ralampay/inclusiveinnovation.git

Conflicts:
	app/controllers/pages_controller.rb

Signed-off-by: kat <kathleenlogmao@gmail.com>