Amiel_file
Ariel details update..
Merge branch 'master' of https://github.com/apple777/hackita-thursdays
amiel fixes
fixing git conflict