Commiting

Feels like I'm making vows
New commitment

I think I'm doing this right?
Merge branch 'matt'
Merge branch 'master' into tina