pulling
fixing merge conflicts
merge
fixed merge conflict
set up basic routes/view
Merge pull request #4 from iliastsangaris/basicpage

Basicpage