huytranpdx/Miyagi-Studios — pull request #4 by AmyVS (2014-06-18 00:24:08+00:00)
Title: fixed merge conflict (hopefully)

see title note