Add feature spec folder
Merge remote-tracking branch 'upstream/release-1' into release-1
Add some specs
Change devise password length
WIP adding buttons to participants/show
Merge branch 'release-1' into release-1-javascript-search
Merge remote-tracking branch 'upstream/release-1' into release-1
Merging all updates
Merge remote-tracking branch 'upstream/release-1' into release-1
Merge remote-tracking branch 'upstream/release-1' into release-1
Merge remote-tracking branch 'upstream/release-1' into release-1
 Connecting Rails with the dashboard
View adjustments
Merge pull request #61 from dazm12/release-1

Add a few specs, updates from before presentation
Merge remote-tracking branch 'upstream/master'
Add files for heroku
Renamed unicorn file
Make changes for heroku deploy
few minor layout fixes from post-presentation
fixed merged conflicts