Merge pull request #1 from everett1992/master

I've finished the basic remodel, it's now more semantic Ember (although there is a lot wrong with it)