minor changes to code
more minor changes to clean up the code
fixed the merge conflict
merge conflicts are my life
Merge branch 'master' of https://github.com/jessupjn/CPRemote