User Profiles
Added user
Views Changed
Changed ReadMe File
Can Post Shows from Admin
Changed Show View
Changed Protocol for Fonts
Changed Protocol for Fonts
Changed Protocol to HTTPS
routes
not much
Merge branch 'master' into mcdonagg

Conflicts:
	app/controllers/season_controller.rb
	app/views/actor/show.html.erb
	app/views/show/index.html.erb
	app/views/show/show.html.erb
	db/migrate/20140428175258_removed_rails_id_from_actor.rb