Fixed various bugs
ignored bootup.css

Conflicts:
	clientApp/css/bootup.css
updated git.ignore