Merging the RTC and GIT project into one

Changes needed to merge the GIT and RTC project into one, so that I can
edit on RTC, and submit my changes directly to GIT