conflict test
Merge branch 'dev' of https://github.com/hbmailinator/test into dev

Conflicts:
	src/test/Test.java