main and index anda application chnanged
.idea
merge
fixed lots of scrolling issues -- still need to decide how to handle moving between '/' view and horizontal scrolling views -- all the tools are in place, but they aren't quite hooked up.