Merge pull request #3 from brittlewis12/mihran

britt is teaching me things
fixing the automerge mess.