first directive
added .idea to gitignore
Merge branch 'redditEntry'

Conflicts:
	public/index.html
Merge branch 'master' of https://github.com/lukasmartinelli/reddit-clone-js