Merge. Add the application files
Merge
Make a diff view to show line numbers correctly
Implement comments for a line of code functionality