Added wiki
Still need to figure out what is going to serve the static files
Merge branch 'master' into wiki
Merged the wiki with the recent master changes