My first try
Merge branch 'master' of https://github.com/bdagostino/cse5236FinalProject