added html# to gitignore
changed about me and socialicons
Merge branch 'dev' into github-master

Conflicts:
	app/static/shafayet/socialmedia/github.png
	app/static/shafayet/socialmedia/googleplus.png
	app/static/shafayet/socialmedia/linkedin.png
	app/static/shafayet/socialmedia/quora.png
	app/static/shafayet/socialmedia/twitter.png