worked a bit on rich text editor, got bold and italics shortcuts working
deleted obsolete file
ignoring nohup output
Merge branch 'master' of https://github.com/jchan172/website_base

Conflicts:
	.gitignore
ignoring output from nohup