Trying to commit again.
Merge branch 'master' of github.com:jquinn630/DrProf

Conflicts:
	NickyRage/Library/CurrentLayout.dwlt