style change
server side send invite
added api call to retrieve usernames
detele comments
Merge branch 'ypei' of https://github.com/neuronspike/movie-night-hack into ypei
good email
merge code
fix
added final chatlist
added hash_chat_heads
main page
resize trailer
fixed chatheads
Merge branch 'new_master' of https://github.com/neuronspike/movie-night-hack into ypei

Conflicts:
	client/code/app/app.js
Merge branches 'ypei' and 'ypei' of https://github.com/neuronspike/movie-night-hack into ypei
added genres
style
Merge branch 'master' of https://github.com/neuronspike/movie-night-hack into ypei

Conflicts:
	client/code/app/app.js
	client/views/test.html
added home
Merge branch 'new_master' of https://github.com/neuronspike/movie-night-hack into ypei

Conflicts:
	client/views/test.html