Test
Subm
More
Trying to add submodule
Adding submod
Merge branch 'server'
Fixing conflicts

Conflicts:
	server/app/views.py