precompiled assets for heroku
precompiled assets for heroku
begun doctors pages
updated rspec-rails
login tests
Merge branch 'administration-pages'
Merge branch 'master' into doctor-pages

Conflicts:
	app/controllers/patients_controller.rb
building doctors subdomain pages; appointments and show
building doctors subdomain pages; appointments and show
set up paperclip for user images
stock images for testing paperclip
doctor can only access his own pages
doctor can only access his own pages
added for profile based fields for doctor model
added for profile based fields for doctor model
added for profile based fields for doctor model
built doctor edit page, added full profile to show page
Added rocketpants gem for api creation
begun basic patient api for mobile use
Updated bootstrap to 3.0.3.0
updated static pages header