Robbie Antenesse 94fa5ea5df Merge branch 'web' into prod ... # Conflicts: # .gitignore # README.md # css/styles.css # index.php # js/dictionaryBuilder.js		2015-11-07 17:02:35 -07:00
..
lexiconga.css	Added Terms and Privacy plus Analytics and Adsense	2015-11-02 10:28:43 -07:00
styles.css	Merge branch 'web' into prod	2015-11-07 17:02:35 -07:00