Final Everything
Merge branch 'master' of https://github.com/martensm/Guest-Tracking

Conflicts:
	Napkin/src/Frames/MainFrame.java
	Napkin/src/Frames/SearchResult.java