jhfhjfhk
Identifier check
Merge branch 'master' of https://github.com/Gatzy118/gonephishing

Conflicts:
	GonePhishing/Models/GPMedia.m
Merge pull request #22 from Gatzy118/nick

Nick
New media adds itself to the manager list.
Merge pull request #23 from Gatzy118/nick

New media adds itself to the manager list.
Birch latest
pod install
Ported pods from vlad
Ported pods over from vlad
Merge
Xcode repo settings
Add Ollie's changes to Pod
Revert "Add Ollie's changes to Pod"

This reverts commit 83b105ee667a20155ab5d988aef392d7292d470e.
Fixed linker errors and other stuff
Fixed images.xcassets
Merge pull request #27 from Gatzy118/ollie-merge

Ollie merge
Fixed build
Merge pull request #28 from Gatzy118/nick-new

Fixed build
Moved @end into header