user db created
Merge branch 'master' of https://github.com/Eddie-D/instaview

Conflicts:
	instaview/db/schema.rb

new file:   app/models/specialty.rb
new file:   app/models/user_specialty.rb
new file:   db/migrate/20130713050804_create_specialties.rb
new file:   db/migrate/20130713051035_create_user_specialties.rb
modified:   db/schema.rb
new file:   test/fixtures/specialties.yml
new file:   test/fixtures/user_specialties.yml
new file:   test/unit/specialty_test.rb
new file:   test/unit/user_specialty_test.rb
working on user model
Merge branch 'master' of https://github.com/Eddie-D/instaview

Conflicts:
	instaview/db/schema.rb

new file:   app/assets/images/glyphicons-halflings-white.png
new file:   app/assets/images/glyphicons-halflings.png
new file:   app/assets/javascripts/bootstrap.min.js
new file:   app/assets/stylesheets/bootstrap-responsive.min.css
new file:   app/assets/stylesheets/bootstrap.min.css
new file:   app/assets/templates/main.jst.ejs
new file:   app/models/request_specialty.rb
modified:   app/models/specialty.rb
modified:   app/models/user_specialty.rb
new file:   db/migrate/20130713052613_create_request_specialties.rb
modified:   db/schema.rb
new file:   test/fixtures/request_specialties.yml
new file:   test/unit/request_specialty_test.rb