Merge local changes
Merge local changes
Merge branch 'master' of github.com:thomastuts/artedex-client
Basic style scaffolding
Pokedex styling
Merge branch 'thomas'
Icon styling
Merge remote-tracking branch 'origin/louis'

Conflicts:
	app/index.html
ik heb geen idee
pyramid of doom
Fix messed up index.html
styling