# This is a combination of 2 commits.
# The first commit's message is:

Basic contacts rendering

Conflicts:
	build/applications-data.js

# The 2nd commit message will be skipped:

#	Move func