homework #7
1
Merge github.com:Navin108/Homework

Conflicts:
	homework_6.php