Merge JS and CSS back into ERB

Trello Issue