Merge pull request #3 from ndhoule/development

Style, indentation, misspelled var name, missing semicolon fixes
Merged junejung-development; WIP : pearsonAPI gets data
refactored the search form and setting up html structure
Merge pull request #5 from mtulac/megantulac

refactored the search form and setting up html structure
Merge branch 'development' into router

Conflicts:
	client/layouts/main.html