commit test
Merge branch 'master' of https://github.com/mikeTong/Frugal-Innovation-Lab-Gallery

Conflicts:
	src/UserRegistration.java
Merge branch 'master' of https://github.com/mikeTong/Frugal-Innovation-Lab-Gallery