problem1
Merge branch 'master' of https://github.com/jmonroe2/TAMU312

well, I'm not too sure. 'git push origin master' command failed and recommended that I merge remote branches