The foundation framework to build off of
	modified:   Gemfile
	modified:   Gemfile.lock
	new file:   app/assets/images/.directory
	modified:   app/assets/javascripts/application.js
	new file:   app/assets/javascripts/bootstrap.js.coffee
	new file:   app/assets/javascripts/html5shiv.js
	new file:   app/assets/javascripts/init.js
	new file:   app/assets/javascripts/jquery.js
	new file:   app/assets/javascripts/welcome.js.coffee
	modified:   app/assets/stylesheets/application.css
	new file:   app/assets/stylesheets/bootstrap_and_overrides.css.less
	new file:   app/assets/stylesheets/welcome.css.scss
	new file:   app/controllers/audio_lessons_controller.rb
	new file:   app/controllers/lesson_topics_controller.rb
	new file:   app/controllers/welcome_controller.rb
	new file:   app/helpers/welcome_helper.rb
	new file:   app/models/audio_lesson.rb
	new file:   app/models/lesson_topic.rb
	new file:   app/models/user.rb
	new file:   app/views/audio_lessons/_form.html.erb
	new file:   app/views/audio_lessons/edit.html.erb
	new file:   app/views/audio_lessons/index.html.erb
	new file:   app/views/audio_lessons/new.html.erb
	new file:   app/views/audio_lessons/show.html.erb
	new file:   app/views/devise/confirmations/new.html.erb
	new file:   app/views/devise/mailer/confirmation_instructions.html.erb
	new file:   app/views/devise/mailer/reset_password_instructions.html.erb
	new file:   app/views/devise/mailer/unlock_instructions.html.erb
	new file:   app/views/devise/passwords/edit.html.erb
	new file:   app/views/devise/passwords/new.html.erb
	new file:   app/views/devise/registrations/edit.html.erb
	new file:   app/views/devise/registrations/new.html.erb
	new file:   app/views/devise/sessions/new.html.erb
	new file:   app/views/devise/shared/_links.erb
	new file:   app/views/devise/unlocks/new.html.erb
	modified:   app/views/layouts/application.html.erb
	new file:   app/views/lesson_topics/index.html.erb
	new file:   app/views/lesson_topics/new.html.erb
	new file:   app/views/lesson_topics/show.html.erb
	new file:   app/views/welcome/index.html.erb
	new file:   config/initializers/devise.rb
	new file:   config/locales/devise.en.yml
	new file:   config/locales/en.bootstrap.yml
	modified:   config/routes.rb
	new file:   db/migrate/20131020234647_create_audio_lessons.rb
	new file:   db/migrate/20131021014934_add_imageurl_to_audio_lesson.rb
	new file:   db/migrate/20131028010546_create_lesson_topics.rb
	new file:   db/migrate/20131028011350_add_lesson_topic_id_to_audio_lesson.rb
	new file:   db/migrate/20131102220248_devise_create_users.rb
	new file:   db/migrate/20131103195708_add_attributes_to_audio_lessons.rb
	new file:   db/schema.rb
	new file:   doc/index.html
	new file:   public/audio/a_minor.mp3
	new file:   public/audio/e_major.mp3
	new file:   public/images/a-minor-chord.png
	new file:   public/images/e-major-chord.png
	new file:   public/movie.ogg
	new file:   test/fixtures/users.yml
	new file:   test/functional/welcome_controller_test.rb
	new file:   test/unit/helpers/welcome_helper_test.rb
	new file:   test/unit/user_test.rb
updated gitignore
Merge branch 'dk-working' into dm-working

Conflicts:
	Guithub/Gemfile.lock
	Guithub/app/models/user.rb
	Guithub/app/views/devise/registrations/edit.html.erb
	Guithub/app/views/devise/registrations/new.html.erb
	Guithub/app/views/devise/sessions/new.html.erb
	Guithub/app/views/layouts/application.html.erb
	Guithub/config/initializers/devise.rb
	Guithub/config/routes.rb
	Guithub/db/schema.rb
fixed Gemfile
Merge branch 'dm-working'