Deleted dist folder
Cleaned up the code with appropriate indentation.

- Removed all tabs (was tabs and spaces)
- Properly indented all javascript files and index.html.
- deleted empty file app/js/collections/Pokemons
Fixes the links to queries in the welcome and pokemon screens.
Merge branch 'update-data' into StAlRuth-downstream
Merge branch 'cleanup' into StAlRuth-downstream

The conflicts were all in the dist folder, caused by the deletion of
  said folder in the cleanup branch.

Conflicts (all DELETED):
	dist/css/normalize.css
	dist/css/screen.css
	dist/css/style.css
	dist/css/types.css
	dist/data/ability.json
	dist/data/move.json
	dist/data/pokemon.json
	dist/js/app.js
	dist/js/main.js
	dist/js/require.js
Fixes type matchup errors

- Fixes the follwing bugs:
  * A single-type Pokemon's resistances are ignored.
  * Offensive strengths and weaknesses are reversed.
  * x2 resistances are shown as x4 resistances, and vice-versa.
  * Offense table mostly maningless.

- Changes made (aside from bugfixes):
  * Offense table now shows the effectiveness of the most effective
      type of a given Pokemon's types, so that STTAB coverage can
      be evaluated easily.
Fixed offense stats being switched
Merge branch 'fix-type-matchups' into StAlRuth-downstream

Conflicts:
	app/js/models/Pokemon.js
	app/js/templates/pokemonContent.html
Fixes error during merge
Another data update.
Merge branch 'update-data' into StAlRuth-downstream
Updated data