joel's branch stuff
adding new tpl files
changing the view for results
adding routes
Merge branch 'master' into gregory
Merge pull request #7 from GJST-Capstone/gregory

Gregory
added joel.html for testing
Merge pull request #8 from GJST-Capstone/joel

Joel 12/2
adding new files for joel
Merge pull request #9 from GJST-Capstone/gregory

adding new files for joel
adding routs and data to the bb views
Merge pull request #10 from GJST-Capstone/gregory

adding routs and data to the bb views
Merge branch 'master' into stacy
fixing index scripts
Merge branch 'master' into stacy
add array of channel ids and insert into URL