precompiling assets
moved splash.css.scss to application.css. precompiled assets
requiring tree in application.css
Fixing issues with compiling.
removing tree from application.css
merging changes
Updating assets.
Argh asset pipeline merge conflicts.
removed public/assets
Merge branch 'develop' into static-pages