Commit
Delete .travis.yml
Delete .gitattributes
Fixed login
Merge branch 'master' of https://github.com/CaptainFalcon92/Shuttle
Added twig support
Create README.md
ERM base
Some views and updates - wip
Adding roles support
Update README.md
Conflict fix 2
Validator not static anymore
User crud improved
Core classes improved
Fix Css
Merge branch 'master' of https://github.com/CaptainFalcon92/Shuttle

Conflicts:
	.gitignore
	.htaccess
	README.md
	doc/schema.sql
	index.php
Merge branch 'master' of github.com:CaptainFalcon92/Shuttle_Scratch

Conflicts:
	controller/BaseController.php