added a mainpage
Merge branch 'master' of github.com:/heartstroke/planesis
some content int the main page
resolved merge conflict