removed compiled assets
change from email
Fix heroku problems
add one more dropbox setting
modify secrets file
Modify dropbox variables
Modify dropbox variables
Merge conflict before Heroku
Fix more forms
Updates for demo day in forms
Fix merge conflicts, talal
Merge release-1 to heroku
One last merge conflict before demo day
change about page for heroku
Add links to about page
Merge branch 'release-1'
Fix performer button
Merge pull request #134 from dazm12/master

Master
merge conflicts in about