testing: commiting straight from eclipse
added smiley bar
fixed conflicts and made chat box non editable
Merge branch 'master' of https://github.com/sidutta/varta
made minor modifications to GUI
event handler for smiley set
user can login by pressing enter on login page
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/varta/view/ChatController.java
	src/varta/view/ChatWindow.fxml
enter works in login screen, added event for smiley
happy smiley
added chatcontroller back, removed for gitignore
Signup Conflicts resolved
Signup Pages
Friends Tabs
New messages
...Typing
Everything works
Images working
Pretty much done
"presentable work done, mihir's timer left"