Removed img folder, no more needed.
Change page title
Changed title
Fontawsome integration
Re-structured
Merge branch 'master' into branch-lingjun

Conflicts:
	index.html
	js/app.js