Refactoring
Added Fixture.
Merge branch 'master' of https://github.com/negzi/Erlang

Conflicts:
	assignments/src/salary.erl
	assignments/test/salary_tests.erl