Minimal stylings (padding, margin), created tyler-branch
Merge branch 'source' of github.com:Pickra/chat-program into tyler-branch

Conflicts:
	app/styles/gitsmack.scss
Merge branch 'master' of github.com:Pickra/chat-program into tyler-branch
Updated title font, overrode some bootstrap defaults to make styling easier
imported source
import ari-source
started writing tests. console is mad @ me because something is wrong with template... help me....
Rehauling Style, toying with design elements, branding
Merge branch 'ari-source' of github.com:Pickra/chat-program into tyler-branch
Updated from branches
favicon, github logo, major overhaul of styles, background and header
Merge branch 'tyler-branch' of github.com:Pickra/chat-program into tyler-branch
added About modal and Contact modal
added hr to delineate messages
Merge pull request #10 from Pickra/tyler-branch

Tyler branch