initial Commit
Merge https://github.com/farhoodlinux/Dev

Conflicts:
	Dev