slight changes
Merge branch 'master' of github.com:LAFcaptstone/capstone

Conflicts:
	public/css/master.css
fixed merge conflicts
deleted file