asasd12
Merge branch 'master' of https://github.com/alinporumb/project1

asdas

Conflicts:
	js/dataTables/ajax-bootstrap3.js
	sources/phones.txt