Merge my Stuff

Added cool function!!!!!!!!!!