Merge branch 'release-1' of https://github.com/festivit/festivit into questionaire
Add feature spec folder
Merge remote-tracking branch 'upstream/release-1' into release-1
Add some specs
Change devise password length
Merge branch 'release-1' of https://github.com/festivit/festivit into questionaire
Merge remote-tracking branch 'upstream/release-1' into release-1
Merging all updates
Merge remote-tracking branch 'upstream/release-1' into release-1
updated forms
Merge conflicts with everyone updating
Merge pull request #58 from JParker85/release-1

Editing Modals
Merge remote-tracking branch 'upstream/release-1' into release-1
Merge pull request #59 from rscottbradshaw/release-1

Updated forms
Merge remote-tracking branch 'upstream/release-1' into release-1
Merge pull request #60 from festivit/release-1

Merge release-1
View adjustments
Merge pull request #61 from dazm12/release-1

Add a few specs, updates from before presentation
few minor layout fixes from post-presentation
fixed merged conflicts