Crime shit
Merge branch 'master' of github.com:jpulec/stackup

Conflicts:
	stackup/templates/main/salary.html
Merge branch 'master' of github.com:jpulec/stackup