Begun implementing search
Merge branch 'master' of https://github.com/dragoon20/IF3038-2013
Added search
Merge branch 'master' of https://github.com/dragoon20/IF3038-2013

Conflicts:
	src/css/style.css