removed conflicts
conclude merge
commits
nicer errors
Merge pull request #55 from msmith7904/aaron_monday_night

Aaron monday night