Commit

fixfixfix
Merge branch 'master' of https://github.com/alphez/intelligencesafety

Conflicts:
	intelligenceTest/src/com/example/intelligencetest/library/Library.java