hi
Merge branch 'master' of https://github.com/ralampay/baliwag-is.git

Conflicts:
	app/controllers/crews_controller.rb
crew
Merge branch 'master' of https://github.com/ralampay/baliwag-is.git