remove node modules
themes
Merge branch 'master' of github.com:wice24/bootshape

Conflicts:
	static/.DS_Store