Initial commit
Merge branch 'master' of github.com:rdmarsh1/mdl

Conflicts:
	.gitignore
	.rspec
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.erb
	config/database.yml
	config/initializers/secret_token.rb
	config/routes.rb
	public/index.html
	spec/spec_helper.rb