ticket:1 reorganization
ticket:1 rm trash
ticket:1 rm trash
ticket:1 use render_to_response
add makefile+req
ticket:1 update makefile, models, views, urls
ticket:1 update makefile, models, views, urls
ticket:1 update makefile, models, views, urls
ticket:1 update ticket
ticket:1 update ticket
ticket:1 update ticket
ticket:1 update ticket
Merge branch 't1_contact' of https://github.com/aphex2/42_Test_Assigment into t1_contact
ticket:1 update ticket
Merge branch 't1_contact'

Conflicts:
	Makefile
	README.md
	tickets/admin.py
	tickets/urls.py
	urls.py
Merge branch 'master' of https://github.com/aphex2/42_Test_Assigment

Conflicts:
	README.md