...
Merge branch 'master' of https://github.com/iboss-ptk/cba_line5_site

Conflicts:
	app/views/pages/signup.blade.php
Merge branch 'master' of https://github.com/iboss-ptk/cba_line5_site