dev layout changes to master
added scrollbar function to test
removed all javascript content, clean slate
Merge branch '6_scrolling_technique' into development