Removed the ast name from my onyx username
fixed some merge conflits
added my folder with the readme file
lennoxs changes
merge