1
Merge branch 'f1' into dev

Conflicts:
	New Text Document.txt
Merge pull request #2 from rsft-akshaya-rao/dev

Dev