Some minor changes
Merge branch 'master' of http://www.github.com/audunsh/fys4411

Conflicts:
	theHartreeFockProject/theHartreeFockProject.pro.user