characters
 lot
Merge branch 'master' of https://github.com/Folashade/hw4-webapp

Conflicts:
	static/src/main.js