modified:   public_html/css/main.css
	new file:   public_html/footer.html
	modified:   public_html/index.php
	modified:   public_html/navigation.html
Merge branch 'master' of https://github.com/Shah-Parth/info.parthshah.us

Conflicts:
	public_html/css/main.css~