update
update2
Merge branch 'master' of https://github.com/hapdesmith/IF3038-2013

Conflicts:
	src/function.php