Merged local version into master, pushing to GIT to get back on track with proper version control.