INitial commit with contributor
Begin to work. Doubi Ya.
TO WORK!
Views and htmls
Finish file upload
Merge branch 'master' of https://bitbucket.org/normanyahq/software-egineering-project

Conflicts:
	se/se/settings.pyc
	se/se/urls.py
	se/se/urls.pyc
UNRESONABLE IN PLAYING VIDEO!!!!
follow usrs
timeline get
:wq
Merge branch 'master' of https://bitbucket.org/normanyahq/software-egineering-project

Conflicts:
	se/friendpair/models.py
new
beautify