Merge branch 'master' of github.com:psychobunny/node-forum

public/src/app.js

@@ -3,13 +3,18 @@ var socket,
 
 (function() {
 
-	$.get('config.json?v=' + new Date().getTime(), function(data) {
-		config = data;
-		socket = io.connect('http://' + config.socket.address + config.socket.port? ':' + config.socket.port : '');
+	$.ajax({
+		url: 'config.json?v=' + new Date().getTime(),
+		success: function(data) {
+			config = data;
+			socket = io.connect('http://' + config.socket.address + config.socket.port? ':' + config.socket.port : '');
+
+			socket.on('event:connect', function(data) {
+				
+			});
+		},
+		async: false
 
-		socket.on('event:connect', function(data) {
-			
-		});
 
 	});