Revert "Merge branch 'trial-Matrix'"

This reverts commit b4e6e62cfbc0474ae2c091db52dcae1dcc455b3f, reversing
changes made to 881d95d24425b0b6bc82167e2e65d77094cb278e.
changed .gitignore to add /app/assets