Updated the assets for the ProjectViewController and started to work on the layout for the about.html page in the app
Fixed Merge Conflict.