New Changes

changes
Merge branch 'master' of https://github.com/connorgorman/paperwork

Conflicts:
	ProgramBoard/ProgramBoard.suo
	ProgramBoard/WebRole1/obj/Debug/TempPE/Models.ProgramBoardDB.Designer.cs.dll