Added Ember States
Merge branch 'master' of https://github.com/pbrandt1/the-iron-throne