- Continue cleanup of merging Ember.js skeleton with Sinatra
- Added Ember.js architecture example from TodoMVC.com
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/index.html
	public/js/app.js