contact & map
Merge branch 'master' of https://github.com/handiwiguna/hyena

* 'master' of https://github.com/handiwiguna/hyena:
  about us
  behaviour

Conflicts:
	app/controllers/home_controller.rb
Merge branch 'master' of https://github.com/handiwiguna/hyena

* 'master' of https://github.com/handiwiguna/hyena:
  pop

Conflicts:
	config/routes.rb
cartoon