second
Merge branch 'master' of https://github.com/yousuffgm/can-ja-hack

Conflicts:
	views/main.php