b1837
Merge branch 'master' of https://github.com/pnecas/sudiyiWebsite

Conflicts:
	sudiyi/public/css/main.css
Merge branch 'master' of https://github.com/pnecas/sudiyiWebsite

Conflicts:
	sudiyi/app/views/main/index.html.swig
	sudiyi/public/css/main.css