Update by Mawin
Merge branch 'master' of https://github.com/iYottt/graduatenew

Conflicts:
	themes/thesis/css/style.css
by Mawin