trivial commit a
trivial commit b, undoing the work of commit a
Merge branch 'fix_master'
Fixing broken commit from before. Sorry guys!