Edited
Merge remote-tracking branch 'origin/master'

Conflicts:
	PaperLessExm_v2/nbproject/private/private.xml
Revert "Edited"

This reverts commit 159c592f41b890052d70f3583d666c5bf1c96928.
Revert "Revert "Edited""

This reverts commit 3b08d16e0e3cb19c857dc863085e87c6148412b4.
Revert "Revert "Revert "Edited"""

This reverts commit ed47b642c413b071883bbb36b92755ee92b29142.
Merge branch 'master' of https://github.com/smafjal/PaperLessExamSystem

Conflicts:
	PaperLessExm_v2/nbproject/private/private.xml
Revert "Revert "Revert "Revert "Edited""""

This reverts commit 99622e394a89f5b6fd34079ea156750760f33d0b.