major changes unrealized
search from with scopes working
landing page prototype with transparent top bar
Styling of band promo page
landing page
fix merge conflicts
Merge pull request #41 from jcward10/release-1

update applications
Merging Styles
Merge remote-tracking branch 'upstream/release-1' into release-1
Search and scopes working
Moved search to index method. Results on scopes are now ordered
cleaned the application html and css
Working importer. Populates 4 associated tables: participants, tickets, ticket_types fests.
merge conflicts
Merge pull request #42 from maebeale/csvimport

Csvimport
fixed merge conflict, preparing for bigger ones
Merge remote-tracking branch 'upstream/release-1' into release-1

Conflicts:
	app/controllers/participants_controller.rb
	app/models/participant.rb
	config/routes.rb
Merge pull request #43 from sebarmano/release-1

Search working
fixed merge conflict with redesigned branch
Merge branch 'release-1' of github.com:festivit/festivit into release-1