added ds_store to ignore
#12 fix
add flask-login to requirements
ReadYou
fix #15 and #16 by using flask-login
Merge branch 'enhance/login'
Merge branch 'master' (@kortaggio's new readme)
Merge branch 'master' (@kortaggio's new readme and @nik_sg's database commit fix)
Merge branch 'master' of github.com:Queens-Hacks/tweetmatch
reorganize view functions so they're all in views.py
Merge branch 'cleanup'
remove old unused main file
Merge branch 'cleanup'
centralize all messages
use current_user everywhere
Merge branch 'enhance/login'

Conflicts:
	tweetmatch/twitter.py
	tweetmatch/views.py
cleanup merge
Merge branch 'charactermessages'
fix #17
fix #11 ?