wireframes
Merge branch 'master' of https://github.com/ericapadilla/testRepo

Conflicts:
	assets/js/jquery.js
	views/home/index.ejs