add nav to splash
add js files to index
add iphone image carousel
add demo'ing button
fix merge conflict