Add dashboard.html
Add users.html
Merge branch 'admin'
Edit fileplacedfromgithub.txt
Merge branch 'master' of github.com:thisisdavid/mytest

Conflicts:
	fileplacedfromgithub.txt

Conflict sorted for fileplacedfromgithub.txt