Changes 0.1
Changes 0.2
Changes 0.3
Merge branch 'master' into satwant3

Conflicts:
	application/views/Home/stylesheets/screen.css
Changes 0.4