js files
welcome page
merging hell
magnific popup first steps
magnific popup popping up now
basic light box with html on button click working
Added side navigation bar. Added nav link icons
popup beautification
Updated CSS
merge hell
merging
perfect nav bar
just made the font green for now to have text readable on red background
last touches for nav
just switched text to green to make it readable on red background
Merge branch 'master' of https://github.com/ButenkoT/contagious

Conflicts:
	app/assets/stylesheets/contagious.css
pills
pills
germs
Added player info graphic for profile page