commit to prep merge
Fix merge conflicts
merging files
Merge pull request #5 from vivekmgeorge/master

merging a clean version of our files with computer usage info