Freaky actions
Merge branch 'test_module' of github.com:bozeak/bookcatalog into test_module

Conflicts:
	sites/all/modules/test_module/.idea/workspace.xml
	sites/all/modules/test_module/test_module.module