added text box functionality
fixed text input
Merge branch 'temp' into dev

Conflicts:
	client/styles/styles.css