Reorganize and new makefile to generate the website directly from the main directory
Change some file names
Add page about debugging, testing and profiling
First draft of the resources page
Reorganize the resource pages and add resolving merge conflicts to version control page
Update the CSS file