Github Merge (Local with Master)

Trying to get the github scripting back in sync