- UI changes has been made
- css file added
Merge branch 'master' of https://github.com/7h0m4s/Primate

Conflicts:
	static/testfile.psafe3
	templates/dashboard.html