added new files
Merge branch 'master' of https://github.com/wice24/bootshape

Conflicts:
	static/.DS_Store