add for
add while
add if
Merge branch 'future'

Conflicts:
	index.php