config
Merge branch 'master' of https://github.com/IndySix/website_v2
update feedback adn videos