Initial commit
Initial Commit
progress
progress
Fixed Migration to be 100% more healthy; progress
Merge branch 'master' of https://github.com/comp615/campustheater

Conflicts:
	.gitignore
	Gemfile
	README.md
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.scss
	app/controllers/admin_controller.rb
	app/controllers/application_controller.rb
	app/controllers/auditions_controller.rb
	app/controllers/pages_controller.rb
	app/controllers/people_controller.rb
	app/controllers/reservations_controller.rb
	app/controllers/shows_controller.rb
	app/controllers/showtimes_controller.rb
	app/helpers/application_helper.rb
	app/models/audition.rb
	app/models/permission.rb
	app/models/person.rb
	app/models/reservation.rb
	app/models/show.rb
	app/models/show_position.rb
	app/models/showtime.rb
	app/views/auditions/all.html.erb
	app/views/auditions/opportunities.html.erb
	app/views/layouts/application.html.erb
	app/views/pages/index.html.erb
	app/views/pages/resources.html.erb
	app/views/people/show.html.erb
	app/views/shared/_show_listing.html.erb
	app/views/shows/index.html.erb
	app/views/shows/show.html.erb
	config/application.rb
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/routes.rb
	db/migrate/20120123004157_add_security_tables.rb
	db/schema.rb
Merge branch 'master' of https://github.com/comp615/campustheater