First PropEr func
Merge branch 'adding-proper-dep' of github.com:tmarble/erltest1 into adding-proper-dep

Conflicts:
	test/test1_tests.erl