text pages
Merge branch 'develop' of github.com:zeuty/hackaton into develop