Merge branch 'master' into kpam-iter4
commit
Implemented framework for search engine

Allows users to enter data into the search bar and click search.
Currently, there is no processing of the data, but it's a start.
The url to access search is /search/?query=data
changed action attribute
Merge branch 'kpam-iter4' of https://github.com/kpscript/pdm into kpam-iter4

Conflicts:
	README.md
Stage Editor styling overhaul, searchbar styling

Overhauled the jQuery Dialog windows that appear when you choose to resize
or name the stage by replacing them with bootstrap Modal windows instead.
Also made the resize button more visible (it's between the Play and Clear
buttons now).

Also, fixed the styling on the searchbar that somehow increased its height
within the stage editor, and only the stage editor. The fix itself spanned
all pages referencing it, though, by adding an id parameter to the search
bar and applying styles to that.
search bar, user profiles, minor styles
Merge branch 'kpam-iter4'

Conflicts:
	README.md
fixed double search bar
Merge branch 'master' into kpam-iter4
templating index.html
search, index template, styling, login story
Merge branch 'kpam-iter4'
logout button change
Massive housecleaning overhaul
remove useless util.js
Flexible stage editor with respect to dimensions of stage
Added enemy to game, also game refactoring

Added an enemy sprite to the game, which triggers death upon collision.
Currently, enemies cannot be added via the stage editor (and already-saved
enemies don't load on the editor), but they will load on the game if you
fiddled around in shell to add them manually. Adding them to the stage
editor will come tomorrow, since it's late.

Also, refactored the code to streamline how assets are managed. Now,
instead of creating the classes for Player/Goal/Block/Enemy within a
for-loop while processing the assets in the system, it processes them
outside, and removes the need for checking the ID of objects within
game.js; this meant that the JSON sent by the server is modified
accordingly.

Finally, since smaller stages cause the endgame message to be clipped
within the smaller game window, replaced the Quintus message with an alert
function (might replace with a Bootstrap Modal) and a button to restart
the stage.
Allow creation of enemies in stage editor

Created functionality that allows enemies to be added onto stages in the
stage editor. Enemies saved in the stage also load when a stage is
requested.

Also, fixed the item replacement bug that places two blocks into the
temporary array, causing issues with the start-point checker
Merge branch 'master' into iteration4