line 29 my ass
Merge branch 'master' of https://github.com/omfgitsjack/justplay into backend
changed databse fil
Merge branch 'backend'
[Frond-end] [Back-end] Got the CSRF Token Working
Merge branch 'master' of https://github.com/omfgitsjack/justplay into frontend

Conflicts:
	app/views/index.php
	public/app/modules/login/login.js