cover flow library added for document
merge conflict
new files
ajax adding document to view
merge conflict peerpen.iml, web.xml. documents.jsp, footer.jsp
peerpen.iml
loading when requesting document
loader image
peerpen.iml conflict