added subfolder
added a function
added function five
merged master with newCode