added a new gag

Nakov as terminator aka Nerminator
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	nakov.html
Merge branch 'master' of https://github.com/TeamBlackOlive/TeamProject

Conflicts:
	.idea/workspace.xml