Fix merge conflict.
Merge branch 'bastard' of github.com:stephaniecoleman/AngelHub into bastard