CSS Changes
Merge branch 'master' of https://github.com/caioddm/TimeTracker

Conflicts:
	code/app/views/adminhome/index.html.erb