theme
Botmaker theme
finalized botmaker theme
Pulling latest version of Scott's repo
minor tweaks
vertical alignment
Merge remote-tracking branch 'upstream/master'
Adding requirements.txt for dependencies
Cleaning up directory structure and CSS
Cleaning up directory structure and CSS
Fixing CSS
Merge branch 'maggie'

Conflicts:
	bot.py
	css/botmaker.css
	static/css/botmaker.css
	templates/archive/index3.html
	templates/index.html
Commiting
Updated javascript
copied some stuff over from scottsfix
fixed bug in base
updated requirements