while and for
merged
added while and for loops