Testing
Headers and comments using JAuto
Added server interaction for temp and credits
Adding changes
Merged branch with Master
Modified calendar class to check merging
Merge branch 'cmu_branch'
Checking if it got merged
Merge branch 'cmu_branch'