g(r) workin, but need to timeaverage <vector <int> bins
Merge branch 'fixbrach'

Conflicts:
	build-project1_FYS4460-Desktop_Qt_5_2_0_GCC_64bit-Debug/PlotTemperature.py
	project1_FYS4460/main.cpp
	project1_FYS4460/project1_FYS4460.pro.user