removing pdfs
Merge remote-tracking branch 'refs/remotes/origin/master'
end of day commit, I'm committed
Latest changes to adding a card to decks
started using the type ahead library for searches with bootstrap
username reminder implemented
Merge branch 'master' into usernamereminder
Delted files left over from merge conflict
Merge branch 'master' into usernamereminder
started work on selectize search results
Search for a card complete, also minimized the ammount of hits which we will get to the database
Changed the style and js links to CDN's where possible :)
delete files now they are fetched using a CDN
merging master into my add_cards
fixed one of my routes
completion of adding a card
Merge branch 'master' of https://github.com/StyleASD/team_citadel

Conflicts:
	app/controllers/UsersController.php
changed a variable name
fixed small bug with ajax for card search
Merge branch 'master' of https://github.com/StyleASD/team_citadel into card_rating

Conflicts:
	app/routes.php
	public/css/styles.css