starting to add wikis
Resovled merge conflict, started wiki's