added app.js
link updates
updated links
cleanup
cleanup
added missing mark
cleanup
fixed conflicts