Merge branch 'master' into dev
blah
removed miscellaneous txt file
here's my stuff
Fix the things.
Temp
stuff
z
Add the sentence generation on the page. Reliant on the db update hunter is writing now.
prettyfied
Merge branch 'glib' of github.com:stuycs-softdev/proj2-pd7-08-theRoom into glib
Merge branch 'master' into glib

Conflicts:
	app.py
	reviewer.py
	templates/movie.html
	templates/search.html
j
Animated
Make the posters links
Fix missing bracket
spaced
Move if statement for increased clarity
Merge branch 'glib' of github.com:stuycs-softdev/proj2-pd7-08-theRoom into glib

Conflicts:
	templates/search.html
tiling in a prettier way