LALA
Merge branch 'master' of https://github.com/YuliantiOenang/IF3038-2013

Conflicts:
	IF3038-2013/DoSearch.php